Update for DB-4657