Merge "Update full charged string (1/2)" into tm-dev