Merge pull request #22337 from demeritcowboy/deprecated-schema