Merge "Simplify feature enablement to a single constant"