Merge "Replace impl ToString with impl Display" into main