Merge "Fix for bug where we don't use default grid on comet, and migrate normally if not in a B&R case" into main