SXL-925 rebuild