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