master: 406f9ac1761fd515e675ba01b68b832b0af4f4c3 Update to_str