Merge branch 'empty-entries'
Merge branch 'init-bare'