SENTRY-505 update