Merge 6 7 rc 3