Merge branch 'jc/pathcheck'