am f9fe845f: Merge "Each primitive kind now spills to different locations."

* commit 'f9fe845f587e856acf4b3f1b19e4b7bab828b142':
  Each primitive kind now spills to different locations.