Fix #313
Fix #312
Fix #311
Fix #309
Fix #303
Fix #305
Fix #306
Fix #304
Merge remote-tracking branch 'origin/1.2.0b' into 1.2.0b