CLOUD-9 Support XL

CLOUD-9 Support XL