Fix form submission
Merge branch 'beta3' into version4