Merge 6.7.1 rc 2 develop 7.0