PPC: upstream changes [0a9fdea..85d22cb]