Merge remote-tracking branch 'origin/32-replace-margo-with-mercury-in-client-code' into 44-adding-tests
