Fixed 'imports' to resolve merge conflict
Merge pull request #2508 from jsfb/monitor-with-context

Start monitoring uses of withContext, related to issue #2112