Merge pull request #9562 from totten/master-19690-schema