Closes TMSS-2831
marked this merge request as ready
assigned to @schaap
requested review from @schaap
looks fine to me
merged
mentioned in commit b80fa92f
