Allow @variant to be used inside addBase
#19480
+47
−1
Draft