Merge "Changed SaveInfo so it supports just optional ids."