Merge "Fix concurrent issue" into main