Changes to support PageExecutionContext (Browser Link) in Razor

Fixes #1083
should be gone