Reintroduce 2.0 support
Merge branch '2.0'