Test cleanup
Merge branch 'master' into cr-v0.4