Issue #11480: Merge with 3.3.