Resurrected commit from !2587 (closed), with pipeline failures fixed and some more strings updated that the original MR missed.
Fixes #6202
Resurrected commit from !2587 (closed), with pipeline failures fixed and some more strings updated that the original MR missed.
Fixes #6202