Merge branch 'jc/warn-pathless-add-finishing-touches'