Sync w/ havana 3 milestone changes.