Merge branch 'hotfix/3.4.12'
good h4
Merge branch 'hotfix/h4' into develop