VE-1025

DO NOT MERGE

Waiting for features to be merged into VE-1025 before merging complete feature into ve-sprint-19.

@inez