CW edits
Merge branch 'master' into compile
build