Closes RTSD-227
requested review from @walle
assigned to @brouwer
mentioned in commit faa95903
merged