Merge branch 'hotfix/5.4.1'