Fixes #7028 - fixing api docs for orgs