Fixed bug with grid extra limit
Merge branch 'release/v0.7.4'