Changes merged from airlift/airbase