BR-80 Minor checkin