Resolve TMSS-1932, TMSS-1983

Ramesh Kumarrequested to merge
TMSS-1932 into master

Closes TMSS-1932, TMSS-1983

Please delete branch TMSS-1983 also.

Merge request reports