merged from informationIntergration\json-generation branch