DELTASPIKE-348 prepare for more ClientWindow samples