Merge "Apply feature flag inject approach" into main