Merge branches 'jc/nostat' and 'jc/empty-commit'