API Client udpates
Merge branch 'API-client-bug-fix' into dev-260714-0525