Merge "Change generic container ids to be more specific" into sc-dev