Final Merge3.0.y fixes