Apply fix for BL-486(3.0) to BL-595(2.0)