Delete commented out code
Merge branch 'master' into features/version_support
Add path alias