I think we should not go for 2.0 now as we want to ship the next release with Indigo SR1 (in mid September). Shipping a version in a SR which isn't compatible with the version in the base release seems wrong to me.