A bit clearer.
More charset fixes for TMCI
Fix the one remaining default-encoding bug.
Fix null check of wrong variable.
Merge remote branch 'origin/next' into next