Merge tag '2.0' into release