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