addressed review comments

1 job for !34 with 95-conversation-viewmodel in 1 minute and 32 seconds (queued for 10 seconds)
latest merge request