Version history 1.2.0.0
Merge 1.2.0.0 to master