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