Merge "Fix proper call to service list"