Addressing comments.

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