Re-implemented request scope and adjusted to changes in context scoping.
Merge remote-tracking branch 'origin/master'