Signed-off-by: Sven Peter <sven@svenpeter.dev> [joey: cherry-pick 1bcf60493e4ee4502daf476f6162794de63d6d17]