BHV-5139: prelim checkin 2