SFF-8654 to 2x SFF-8643 - CI Design