Merge "Remove feature flag on main branch." into main