Merge "Add support for secret management service"