Merge branch 'make-before-break'