cherry-pick 693

Deepa Kumarirequested to merge
cherry-pick-for-693 into release/0.27

Original MR:!693 (merged)

Edited by Deepa Kumari

Merge request reports