Merge branch 'hotfix/2.5.3' into 'Support/2.5.X'

hotfix/2.5.3 into Support/2.5.X

See merge request !450
1 job for 2.5.3
latest