3fbc9e6de6
(cherry picked from commit 117bee787f)
Co-authored-by: Florian Duros <florianduros@element.io>
(cherry picked from commit 117bee787f)
Co-authored-by: Florian Duros <florianduros@element.io>