Merge branch 'jk/system-path-cleanup' into maint