Minor fixes
Update core grid to v1.6
Merge remote-tracking branch 'origin/development' into gh-pages