Merge branch 'master' into after-262