Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'