address comments

1 job for !92 with lazy-event in 10 seconds
latest merge request