Contrail 1.05 support - part 1