Merge "Remove wfSetBit()/wfSetVar() calls in DatabaseBase"