(M-47586): Separate GB and CNS.