version6 diff from master