Merge #11488 patch from 3.1.