Closes QDS-10755 and QDS-11137.
This MR brings the following features;
requested review from @thhartma
assigned to @hancerli
approved this merge request
enabled an automatic merge when the pipeline for 3b6d4d0f succeeds
merged