Codevalues functionality was broken during GK demo!
Merge pull request #241 from vishwasbabu/develop

Codevalues functionality was broken during GK demo!