SENTRY-342 updated