Merge branch 'jc/name' into next