Updating 3.0.2 batch 2