Interim checkin to support json
Removed generic warning