Merge pull request #2993 from wpaulino/handshake-complete-timer-tick-occurred-race