toolbox-sca-12 Refactor to resolve VariableStore, FeatureModel coupling.