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