SENTRY-504 update