Merge remote-tracking branch 'origin/master' into pro-color-picker-2268