Fix issue with feature flags where default value may not be honored

Fix issue with feature flags where default value may not be honored #5134