Address the merge request review comments.

1 job for 317748-non-regression in 5 minutes and 58 seconds (queued for 2 seconds)