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

Sync 6.x to master220213