Merge window fix for node-side rendering