Merge pull request #2306 from NGSegovia/ngsegovia/keepalive_disable_delete_counter