Updating to 4.4.1
Merge branch 'hotfix-4.4.1' into develop