Resolve TMSS-1112, TMSS-1922, TMSS-1933

Ramesh Kumarrequested to merge
TMSS-1112 into master

Closes TMSS-1112, TMSS-1922, TMSS-1933

Also delete branches TMSS-1922 and TMSS-1933

Merge request reports