Merge "Fix the feature flag mis-checking cause exception issue"