Merge branch 'hotfix-2.5.2'
control fix
Merge branch 'hotfix-2.5.3' into develop