Incorporating the hotfix to properly handle requests again
Merge branch 'hotfix-incorporate_requests_api_hotfix'