Minor DB function tweak
Merge origin/master
Minor DB function tweak