Intermediate development state for import correction
Tiny adaptations to get gtu import functional
Resolved merge conflicts and reapplied the modifications made since