Merge "Fix crash of resource not found for grid options" into main