Merge branch 'jc/use-local-bear'