upstream commits: e277575987 600b7bfa89 Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
e277575987
600b7bfa89