Updated for 1.7 release.