(Merge 3.2) Issue #13339.