Merge branch 'implement-foo'