Moved existing code to "default-api" branch.