Merge branch 'hotfix-4.6.2'