Merged changes for Windows compatibility from benthos-dc