Mosaic application fixes

Merged Rémi Cresson requested to merge 2331-mosaic_app_fixes into develop

Merge request reports