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