Made adding of grid group more robust
p4#: 21236