Comment 5 for bug 2002343

Thanks All. Does the thing. Layout improved. Tests/lints clean. Merged to main and 3.11, including a tiny follow up patch to make the --configuration=production build happy (rename template variable).