Tidy up
Merge branch 'newdev' into test