Merge "Avoid use of DatabaseBase in /includes"