Issue #14502: merge with 3.2
1 file changed