Issue #17221: Merge 3.4.0 Alpha 1 entries before and after 3.3.1 release candidate 1.