Merge branch 'backport-3.16-toc_on_ppc' into toc_on_ppc