Merge "DatabaseBase constructor cleanups"