Merge "Re-adding dbdataobject stuff which got pulled from core about 2 weeks back...