[3.0.72] Merge changes