Default type - 'string'
Merge branch 'subhash/master' into dev