Merge "Reset RequestContext between tests"