Restore missing code parts

Jorge Camarero Verarequested to merge
166-Fix-missing-code into main

Summary

Requires manual tests in pre-production

References

Closes #166 (closed)

Merge request reports