add dev2 update
Merge branch 'dev'