Merge 3.2: issue #13140