adding auto_reconnect option
new config and new infrastructure version
fix merge conflicts