Refactor syntax 6 7 rc 1 merge