Closes QDS-11466
requested review from @thhartma
assigned to @hancerli
approved this merge request
enabled an automatic merge when the pipeline for 08947425 succeeds
merged