Merge "Fix Service-object-path"