Closes RTSD-156
requested review from @kooistra
assigned to @donker
enabled an automatic merge when the pipeline for d4a911bf succeeds
merged
mentioned in commit c584762f