Merge branch 'hotfix/4.9.2' into develop