Updated for CR1 build.