[sr-dev] git:master:7fb391b4: Merge pull request #2474 from NGSegovia/keepalive_solve_sync_problems