Merge "Fix problem with generated file names"