(*) CTL-472 Added more safety nets for logging weaving