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

Sync 6.x to master220412 + Fixed OSGI Shell