Merge branch 'master' into cmp0082-exclude-from-all