Merge "Consistency tweak: Wrap variable names into <code></code>"