Merge branch 'hotfix-4.5.2'