CLDINT-910 fix in service locator