b:Do not retry 3 times with ping, do not display communication errors if disabled, fix add work regression
o: Small fixes to enhance robustness