Cherry pick 922

Deepa Kumarirequested to merge
cherry-pick-922 into release/0.27

Original MR: !922 (merged)

Edited by David Diederich

Merge request reports