Merge pull request #22107 from demeritcowboy/test-isdir