Interpret environment
entries as path parts
#1483
Merged
environment
entries as path parts
#1483