Address review feedback

1 job for !87 with 82-user-feedback in 6 minutes and 24 seconds (queued for 2 seconds)
merge request