Merge #23722 from 3.6