SENTRY-121: Merge master into db_policy_store