Merge pull request #2567 from vlakoff/develop-2

Polishing Form helper