Ported changes from release.