CAAERS-6823 CAAERS-6787 CAAERS-6792 CAAERS-6786 fix e2b consumption issues