CAAERS-6991 consume legacy organizations as active
Merge branch 'feature/CAAERS-6991' into develop