Merge branch 'branch-commits' into goodies