Disable questionable rescanning on upgrade
Add downstream fixes