Merge 3.2 (linked to issue #1294232)