featureC complete!
Merge branch 'featureC' into dev