Merge "Fix return types in documentation"