Maybe I should test things before committing
Merge branch 'hotfix/2.4.4'