Merge pull request #23893 from dmatej/sync-to-6.x

Sync from master to 6.x