Cleanup path var name
Merge branch 'master' into 4.x