Merge branch 'hotfix/4.9.1'