Update client-side keep-alive handling logic

Update client-side keep-alive handling logic #4697