Back in my day we called this feature branching