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