Fixing issue with setting form method
Merge branch 'develop'