Several DataRecord modifications
branch merge