Merge branch 'cw/maint-exec-defpath' into maint