Roll up commit from ix repo
Merge with internal repo, this will be RC1
Sync with ix repo r1697, fix numerous bugs, enable treemenu, turn on mps
