Merge branch 'broken-by-amend'