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