SENTRY-280: Sentry-202 missing changes

(Sravya Tirukkovalur via Jarek Jarcec Cecho)