update to v8, use merge instead rebase.
Merge branch 'develop'
remerge 0.7 code back