Merge branch 'hotfix/5.5.1'