issue #18983: Might as well add all the other things that are crm specific