CAAERS-6886, provide a bug fix for CAAERS-7031.
Merge branch 'feature/CAAERS-6886' into develop