Did some work towards DB-2559