Replace upsert with a find and replace until we can figure out why upsert wasn't working
Merge branch 'develop'