Refactor uc2

Merged Harkamaljit Singh requested to merge RefactorUC2 into master

Merge request reports