Merge branch 'hotfixes-OSG3.2-Handzus' into develop