Recover TCA fix + test suite work from now defunct !431
We dropped !431 (closed) in favor of !438 (merged), but it still has the important fix 086f6397 for #18303 (closed) and some test suite work that we don't want to lose.
Closes #18303 (closed)
Edited by anonym