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