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