Fix linters

6 jobs for !6545 with cherry-pick-01549170 in 14 minutes and 26 seconds (queued for 2 seconds)
latest merge request