Merge branch 'develop'
change version to 9.4beta3
Merge branch 'master' into develop