Add feature 1
Hotfix for release 5.4.4
Merge branch 'release/5.4.4'