Merge #15415 from 3.3