Documentation upgrades
merge