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