Co-authored-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 1e954349)