Merge branch 'jc/capabilities' into maint