Merge "Add two flags needed for V fixes" into main