Merge "Build engineering for variability (17)"