for cms_var: renamed isData to is_data
??
resolve merge conflict