master: f21911e1da85278ca0212deaa0fe33a0fbb8cf23 Extract converting from str