Merge 6.7 rc 4 7.0