Merge "v23: Remove "UNION TRICK" from vdl"