Merge branch 'hotfix/3.12.4' into develop