Merge "[BugFix] acquireProvider maybe wait for timeout"