Merge "Fix the instrumentation report issue"