Merge branch 'hotfix-4.3.6'