Merge "Change CoreStartable @Dependencies to Injected Map" into main