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