Updates for build b317.