Merge "Fix calls to DatabaseBase static functions"