hotfix/2.5.3 into Support/2.5.X

Merged Alexandre Morin requested to merge hotfix/2.5.3 into Support/2.5.X

Merge request reports