Feature-Oriented Evolution of Variant-rich software systems