Merge "Fix some API comments for archive APIs." into main