Merge "Fix stream-events documentation"