Matthias, I rebased the patches to make it more clear what we were backporting from upstream. The ashpd changes is now a separate patch but I didn't really work on fixing this issue.
I believe this email will also extend the autoremoval date. Thank you, Jeremy Bícha
