3.0.1 & 3.0.2 Merge