More sensible logic
Merge branch 'upsert-suggested-fix' into temp-built
grunt build