Refactor 6 7 rc 2 merge w32