Grid format updated for M2.8 and M2.9