More tidy fixes
Not sure why these don't show up consistently…
Backport: release
GitLab update will be applied on June 14th, between 8am and 10am, EDT (UTC-04:00). This site may have intermittent delays during that time.
Not sure why these don't show up consistently…
Backport: release