Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (backported from 93cc44c433fed754bd76f8016a1660a6b932361e)