Merge with 3.2 (Issue #12404).