Merge branch 'master' into range-selector-repair