Merge branch 'master' into feature-normalized-cpu