AirlineReplication merge

Merged Itamar's code