Add missing usage of additionalFields in form classes
Add missing usage of additionalFields in form classes
Merge branch 'refs/heads/2.0'