Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging