Applied SCHEMA-407 patch