Upgrade hyde

Merge changes from Hyde 2.1