Merge "Add recursion check to createService()"