Changes for release 1.2.0 (v1 release with fixes/improvements backported from v2)

Changes for release 1.2.0 (v1 release with fixes/improvements backported from v2) #2966