Ticket #10986 Ibis export refactoring - cleaning up
Ticket #10986 Ibis export refactoring - cleaning up

csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano