Merge pull request #18581 from demeritcowboy/requirements-check