Closes RTSD-271
requested review from @kooistra
assigned to @kooistra
enabled an automatic merge when the pipeline for 1f67622d succeeds
mentioned in commit 1f281827
merged