B-51783 adding keep alive strategy and tests