Fix import

13 jobs for !2677 with cherry-pick-f694e6c1 in 13 minutes and 38 seconds (queued for 3 seconds)
merge request