Sync w/ Havana 3 milestone.