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