SENTRY-432: Rebase diff on master