minimalized
Merge branch 'master' into cp