Merge "Fix potential race condition problem"