Merge "Fix test failure in post submit" into main