PPC: upstream changes [cc93d72..b373966]