Merge pull request #23767 from dmatej/sync-6.x-to-master-merge2

Sync 6.x to master