[#633] Unify user upsert to fix concurrent race condition#650

realproject7 merged 2 commits intomainrealproject7/plotlink:mainfrom

task/633-upsert-race-fixrealproject7/plotlink:task/633-upsert-race-fixCopy head branch name to clipboard