1.0.6 Merge