Update mcp schema processing to use simpler override method
Simplify angular editor config
Merge remote-tracking branch 'upstream/master'