Handle tenant ids properly during incremental instance updates.