Reapplied DBCell etc etc patch to head after it had been clobbered during the move from the rel_2_branch to head. Refixes bug 9576