The combination of values from the specified fields must be unique option did not work, though the code to make it work was partially there. This finishes and fixes that.
Related to #2914527