Merge "Adding suppport for boot time #Conn cfg"