Merge "Avoid MWException and wf* log methods in DatabaseBase"