Iteration03 - review fixes

1 job for !3 with iteration-03 in 33 seconds (queued for 17 seconds)
latest merge request