Added if-let feature gate opt-in