Sync w/ downstream Havana 3 milestone.