Merge "If decouple flag turns on, skip legacy value verification" into main