Essential functionality and tests for reviews complete.
Merge branch 'master' into review_dev