More work to v7 compat + upgrades v7 site
More upgraded files