Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de> (cherry picked from commit 972adafd29)
972adafd29