Issue #15060: merge with 3.2