Merge pull request #3785 from motiondivision/feature/1400-reorder-grid