Resolve TMSS-579, TMSS-581

Ramesh Kumarrequested to merge
TMSS-579 into master

Closes TMSS-579, TMSS-581.

Please, delete both branches TMSS-579 & TMSS-581.

Merge request reports