Laura Fitzgerald, yes, I think it's suitable to complete this ticket asap, but I would say let's do it after Vojta Sazel's PR is merged so he's not overwhelmed with conflicts that would arise by running the auto-lint now.