3.0.57 upstream changes