Roll up commit from ix repo
Sync with ix repo r1697, fix numerous bugs, enable treemenu, turn on mps
sync with ix repo r1526, merge in datagrid