XD-2533 Upgrade to Reactor 2.0 M2