Merge pull request #16567 from calavera/context_per_request

Define a context per request.