CAAERS-7043 - refactoring