Handle response_code
Merge branch 'origin/hotfix/response-code'