Merge branch 'jc/capabilities'