[unrelated] Avoid duplicate pivot models
4 files changed