Merge branch 'hotfix/4.8.1' into develop