Verson 1.2 preparation
Merge branch 'release/1.2' into develop