Signed-off-by: Stefaan Ghysels <stefaang@gmail.com> (cherry picked from commit dacda44755)
dacda44755