Merge "Add test for variant override" into feature/zuulv3