Merging latest changes in the master branch.

Includes the API change and the single record route correction.