CAAERS-6599, CAAERS-6587, CAAERS-6595 - updated for caAERS-Rave E2B integration