addressing comments.

2 jobs for !56 with users/komakkar/handshakeFilter in 25 seconds (queued for 1 second)
merge request