Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> (cherry picked from commit 4b587f2561)
4b587f2561