Merge "[Role Logic Move] Make flag fixed" into main