Merge "Fix debug context."