Pick pull request #2252 from master

Modified env resource to break values up by delimiter before comparing