Resolve TMSS-1090

Mario Racitirequested to merge
TMSS-1090 into master

Also resolves TMSS-1274.

Closes TMSS-1090

Edited by Mario Raciti

Merge request reports