[sr-dev] git:master:7a136428: Merge pull request #2177 from ycaner06/keepalive3