quick fix
Merge branch 'release/release-1.2' into develop