Merge pull request #18174 from demeritcowboy/d8-upgrade-warning