Added 'z1' as hotfix
Merge branch 'hotfix/3.4.12'