Updated error messages
Merge branch 'master' into pilot
Set headers and data field for request
Merge branch 'master' into pilot