Merge branch 'hotfix/3.12.2' into develop