Closes TMSS-378 & TMSS-424
Merge details
Closed TMSS-378
· Mentions issue TMSS-424
merged
mentioned in commit 2ed98c8c