We need to set the HttpContext to null in SetUp as well
Merge branch 'develop'