improve form spec
Merge branch 'hotfix/0.5.10'

* hotfix/0.5.10:
  improve form spec