Versioned as part of Release Candidate for v1.8