Merge remote-tracking branch 'remotes/rth/tcg-ppc-merge-1' into staging