some minor fixes
Merge branch 'release/release1.2' into develop