Update from db-2.3.16.