Merge branch 'hotfix/4.5.1' into develop