Lps 51193

The changes to toString() are squashed into the first commit, nothing also is changed.