Merge "Add flag for lazy variation instance creation" into main