TMSS-183: reapplied reverted commits cad13a89 39f64d7f 9e39ce94 8e7b08e6 25d2e3f2 e4dbedc9 0015db7c c5ba3df4 6c9575c4 with JIRA issue number TMSS-183