*8868* Back-port grid changes to omp-stable-1_1
*8868* Back-port grid changes to omp-stable-1_1
*8868* Back-port grid changes to omp-stable-1_1