Merge branch 'jc/bare'