Merge "Minor change to resource name regex"