Merge UC30 into Master

Merge request for UC30 into master. Please look through code for compliance with our code standards, run the unit tests locally and approve this merge request when done. Message the group so we can complete the merge.