Merge branches 'release' and 'ppc-workaround' into release