Merge "Changing name of RowCount to GridDimension to be more general" into main