Resolve TMSS-1927, TMSS-1986, TMSS-1991

Ramesh Kumarrequested to merge
TMSS-1927 into master

Closes TMSS-1927, TMSS-1986, TMSS-1991.

Please delete branches TMSS-1986, TMSS-1991 also.

Merge request reports