SXL-922 Rebuild