Closes HPR-152
requested review from @kooistra
assigned to @walle
enabled an automatic merge when the pipeline for 83b3b5d3 succeeds
mentioned in commit 770346f3
merged
unassigned @walle