Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> (cherry picked from commit b7ff8b8087)
b7ff8b8087