fix of gridId
Merge commit 'c303397'