Data fixes after cherry-pick, not quite to plan...