#291
#246
#262
Merge remote-tracking branch 'origin/1.2.0' into 1.2.0