Resolve TMSS-1378, TMSS-974, TMSS-635

Ramesh Kumarrequested to merge
TMSS-1378 into master

Closes TMSS-1378, TMSS-974, TMSS-635

Please also delete branched TMSS-974 and TMSS-635

Edited by Ramesh Kumar

Merge request reports