[WIP] Master branch dev version / 2.0.x dependencies