Merge "Avoid relying on lambda identity equality" into main