Closes RTSD-265
requested review from @walle
assigned to @kooistra
enabled an automatic merge when all merge checks for 9c1032b6 pass
merged
mentioned in commit 7b30aef8