Merge "Update documentation and cleanup to unhide API"