It's upstream now with a one trivial fix. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit f975ab8f4e3d5b8a8e81870c70d427f9d84b203b)