Merge branch 'hotfix/3.12.3' into develop