Version history 1.2.0.1
Merge 1.2.0.1 to master