Merge changes from airlift

Changes from Airlift that required enough conflict resolution to merit review.