Merge UAA with master

Merged Ranet Puusepp requested to merge patch-1 into master

Merge request reports