add sfu 6
add g1
Merge remote-tracking branch 'origin/dev' into dev