Issue #3346333: Schema issues

Stephen Mustgrave requested to merge issue/security_review-3346333:3346333-schema-issues- into 2.0.x Mar 06, 2023