Merge pull request #54 from 30x/XAPID-1049

Xapid 1049 apid updates for Org/Env scopes