Merged custom changes to grid.