Merge branch 'hotfix-4.4.4'