XD-1388: Upgrade to batch M3