Merge branch 'jc/empty-commit'