Merge pull request #5084 from BrzVlad/feature-worker-context