Merge "Variability: decouple wrapper layer from UI+fix in interpreter"