adds g5
Merge branch 'dev'