I may have to clone some bugs for f20 if process requires a bug. Patches 3 and 5 could be left out of f20 if we're in lockdown mode already, but they're both low-risk and improve the code we're maintaining so I think deferring them would be a mistake.