Merge branch 'dev'
Revert version 3.0
Merge branch 'master' into dev