Merging x.10.9.1 and x.10.10.1 patches

Joao Afonsorequested to merge
merging_x.10.9.1_and_x.10.10.1_patches into main

Summary

Requires manual tests in pre-production

References

#655 (closed) #654 (closed)

Merge request reports