Ensure that filename is always unique, even if KCC-generated ones already exists.
Merge remote-tracking branch 'origin/master'