This backports upstream fix from the master branch. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 13d57a5e9f) (cherry picked from commit 6e1104cc6d)
13d57a5e9f
6e1104cc6d