Merge "Fix boot time regression for IMS after refactoring change"