Merge "Fix thread safety issues;"