Multiple form support
Merge remote-tracking branch 'origin/automatic-form-registration'