Release/21.36.0
Changelog: https://gitlab.com/gitterHQ/webapp/-/blob/develop/CHANGELOG.md#21360-2021-06-16