Merge "Avoid MWDebug usage in DatabaseBase"