merge 7.0 changes to 8.0