update to r7 branch