Merge "Model enhancement to support embedded JSON"