This follows https://github.com/esp8266/Arduino/pull/6368#issuecomment-517816819 and would bring a better fix to wstring.cpp