Merge branch 'jk/capabilities-doc'