#15222: Merge 3.2