Prioritize path.system
over path
when it makes sense
#3933
Merged
path.system
over path
when it makes sense
#3933