PPC: upstream changes [49164ae051df93cf702ff17b57cfb958b751eafe]