Add support for generic form types#5

dwb357 wants to merge 2 commits intomrylmz:mainmrylmz/Prototype:mainfrom

dwb357:GenericFormTypesdwb357/Prototype:GenericFormTypesCopy head branch name to clipboard