Merge #11578 test from 3.2.