Merge pull request #18762 from demeritcowboy/all-ALL