Updated core files with latest appForms branch