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