Updates for build b318.