Merge 3.2: issue #14937.