Closes TMSS-298
added 3 commits
Compare with previous version
added 6 commits
master
merged
mentioned in commit 7f27ec32