Initial 3.0.0_wip branch changes.