Fix #336
Fix #334
Fix #333
Fix #335
Merge remote-tracking branch 'origin/1.2.0b' into 1.2.0b