Resolving review comments

11 jobs for !181 with sasarava/log1 in 43 minutes and 59 seconds (queued for 3 seconds)
latest merge request