ReDSL ticket 2057cafd6c7e: Split high-CC module