Merge airlift changes