Merge "Update various @params from DatabaseBase to IDatabase"