Update Harvest deps
Merge branch 'master' into demo
Apply migrations from Harvest update in 217efdca