merge and clean private g7 branch