Merge branch 'backport-3.15-toc_on_ppc' into backport-3.16-toc_on_ppc