Merge conflicts for !2066

This MR is to resolve conflicts which occurred while picking !2066 (merged) into 9-3-stable-ee for RC3.