task: #3626588 Direct injection of storage is discouraged

Ben Stallingsrequested to merge
issue/migrate_tools-3626588:3626588-direct-injection-of into 6.1.x

Co-Authored-By: Claude Sonnet 5.5 noreply@anthropic.com

Closes #3626588

Merge request reports