Merge "[PB] Only handle one merge transition request." into main