Merge branch 'jc/convert'