Issue #23672:Merge with 3.4