Fix #316
Fix #315
Fix #314
Fix #317
Merge remote-tracking branch 'origin/1.2.0b' into 1.2.0b