Merge "Define common irrelevant-files"