fixes for payload if json
fixing up payload
Merge remote-tracking branch 'origin/development'