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