enhancements to auto-connection-recover