Correct location for getValueFromData()
Merge branch 'master-upstream'