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

Merge-request: !4122