Versioned as part of Release Candidate for v2.0