Address review feedback

1 job for !14 with api-prototype in 3 minutes and 25 seconds (queued for 8 seconds)
latest merge request