Updates for build b587.