Updates for build b309.