Merge "Adding credentials for service user"