Merge conflicts for !2155
This MR is to resolve conflicts which occurred while picking !2094 (merged) into 9-3-stable-ee
for RC3.
Edited by Kushal Pandya
This MR is to resolve conflicts which occurred while picking !2094 (merged) into 9-3-stable-ee
for RC3.