PPC: Merged r20033, r20138 into 3.24 branch (part2).