Fix #14943. Merge 3.2