Closes TMSS-2195
It's a Christmas gift.
approved this merge request
merged
mentioned in commit 31192942
