Merge "Add missing @return to function docs"