Merge "Fix deadlock issue."