Merge pull request #2326 from NGSegovia/keepalive/first_check_on_start