Fix form-init name problem
Merge branch 'master' into develop