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