Merge issue 19548 changes from 3.4