Closes RTSD-224
requested review from @walle
assigned to @kooistra
merged
mentioned in commit 80d9ed3d