Merge branch 'backport-kwsys-ConsoleBuf-windows-terminal' into update-kwsys