Issue #3039477 - Fix t calls

Closes #3039477

added 2 commits

• b56c19d6 - 1 commit from branch project:8.x-1.x
• aa79ea0c - Merge branch '8.x-1.x' of https://git.drupalcode.org/project/mpac into 3039477-t-calls-should

Compare with previous version

merged