Merge "Deduplicate reported fold features." into main