Upgrade to Discovery 1.20-SNAPSHOT
Upgrade to Airlift 0.93-SNAPSHOT