Use unique db resource identifier for abtests
Merge commit 'origin/master'