CAAERS-6886, provide a bug fix for CAAERS-7031.