Updates for build b217.