Merge branch 'jc/bundle'