unit test - upsert
Merge branch 'master' into ubuntu