Merge remote-tracking branch 'origin/master' into stable-v1.2.x