HH-32140 xsl watchdog fixes