Added default to APIClient to load opts if not provided.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #6704 from SmithSamuelM/develop

Added default to APIClient to load opts if not provided.