Closes QDS-10801
requested review from @thhartma
assigned to @hancerli
approved this merge request
merged
mentioned in commit 590d8c2a