Merge "In the case the gird migration goes to a taller grid keep the grid configuration" into main