Small change in relationship index and fk name algo to avoid conflicts
Merge remote-tracking branch 'upstream/master'