Upgrade to Discovery 1.20-SNAPSHOT