Merge "Replace old no-service resource with new one"