Merge "Remove char state cache." into tm-qpr-dev