Merge branch 'lr/init-bare'