Improve execution context logging (#1206)

5 files changed