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