Grid is working without bugs
Merge remote-tracking branch 'origin/master'