Merge "Update feature flag bugs" into main