complete ver7
Merge remote-tracking branch 'upstream/ver7'