Merge "Fix service metadata"