Merge "New modules for DI, utils, settings, and retail" into main