don't include id/ piece of file key; just use the file name and stores can adjust as they see fit
Merge origin/master