Combined with 2.0.0-wip branch