Per the discussion of bug #277095 comment #1 ~ comment #5, use this PR to track my work on adding the "multi-key-fields" support on top of D43648.
Closing this (along with the others) as they seem to be overcome by events.