Merge 2110-staging 21.10.3 into main

Doris Tamrequested to merge
2110-staging into main

We are not using sentry at the moment but may wish to in the future.

Merge request reports