Adding condition to generated file deletion
Merge pull request #711 from markcowl/cleanfix

Adding condition to generated file deletion
Merge remote-tracking branch 'upstream/dev' into dev
Synced from upstream