Added support for grid without form
Merge branch 'release/v0.6.2'