solve 2501_Grid_Mori
Merge branch 'feature-2501_Grid_Mori'