Fixed parameter validation
Merge branch '2.0'