Merge branch 'hotfix/bugzilla-4.4-fix'
Merge branch 'master' into bootstrap