Continues work started by `@tachyons-gitlab` in https://gitlab.com/gitlab-org/gitlab/-/issues/509182+ to support the contribution to be merge ready.