Closes QDS-10485
This MR brings the following features;
requested review from @thhartma
assigned to @hancerli
approved this merge request
merged