DB/Conditions: Fix db error
Merge branch 'upstream/master'