[master] Fix unique_together issue.