Closes RTSD-271
requested review from @kooistra
assigned to @kooistra
mentioned in commit 0cadcb44
merged