Merge branch 'hotfix/3.8.1'