Resolve TMSS-255

Jörn Künsemöllerrequested to merge
TMSS-255 into master

Closes TMSS-254, TMSS-255, and TMSS-256

Merge request reports