Merge branch 'fix-statuscodes-1'
Fix encoding error
Merge branch 'fix-statuscodes-2' into dev