PPC: upstream changes for v3.24.35