Merge issue 17844 from 3.3