Merge "Use names containing "non-existing" as non-existing resource names"