split "create" and "edit" on form page - right now we support only "edit"
Merge remote-tracking branch 'origin/version3' into version3