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