Updated for product 6.0.2