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.

changed milestone to %Iteration 3

added 1 commit

• ecfd5819 - Clean up comments for merge to master

Compare with previous version

marked this merge request as ready

Looks good to me, all tests are passing

approved this merge request

merged

mentioned in commit 232c73e3