replication retry and agent warning improvement

for updating 0.9.33 - just for the record