Merge "Fix service instantiation error"