Roll up commit from ix repo
Fix broken path
Sync with ix repo r1697, fix numerous bugs, enable treemenu, turn on mps