Merge "Perform agent startup-attach before bind"