Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit b0145891676faa38f0a5991e3e229aed7b4a9117)