Merge "Fix broadcast type value handling error" into main