Update to 2.8-xo6-beta2