Merge "Fix thread safety issue with StartExi operation"