Merge branch 'hotfix/4.12.2'