chore: forward port 18648 (#3489)
data.finset.lattice
1c857a1f6798cb054be942199463c2cf904cb937
a968611b6a772cf7bdf61146e6d62fc882c92372