Merge "Change grid migration to start from top to bottom" into tm-dev