(M-48560): Separate CNS and GB.