Closes RTSD-264
requested review from @walle
assigned to @kooistra
mentioned in commit 8745421e
merged