Fixed form parameters
Merge branch '2.0'