Match changes in DataValues

Change-Id: Ieac9ef7114d6468aea28bd25f5d214fb98155198