Merge "Auto-generate docs based on annotations." into oc-dev