Starting 2.0.0-beta-7