Merge branch 'master' into dev
license update
Merge branch 'dev'