3.0.56 upstream changes