Merge "Fix instrumentation context initialization"