Merge branch 'jc/exec-cmd-system-path-leak-fix'