Merge with 3.2: issue #14433