Merge "Ensure BBQs created in a VRI use the same apply token" into main