(cherry picked from commit dddef858f1) Co-authored-by: Michael Weimann <michaelw@matrix.org>
dddef858f1