Sync w/ Havana 3 milestone release.
Remote b3 from version.