Merge "Fix isFeatureEnabled namespace and overload usage"