hotfix/2.6 into develop

Merged Alexandre Morin requested to merge hotfix/2.6 into develop

Merge request reports