Issue #21992: Moved pickers to Inventory extension