merge 7.0 changes to master

forward port recent changes made to the 7.0 branch to master