Defer schema properties' inheritance
Merge branch 'master' into struct-editor