Merge branch 'release/1.2.11' into develop
fixed class name
WIP
Merge branch 'release/1.2.12'