issue #21684: crm additions