Merge branch 'jc/merge'