Merge "Remove extra BAL overrides" into main