Update with ingest support for combined r1 & r2 tier placement