7823 new forms app

Fixed bugs related to forms integration.