add parameters in KeyValuePair
erge branch 'master' into wj_dev