Merge "Annotate root objects and show their types."
am: 0e72abfae7

* commit '0e72abfae75e0072679c425b7a4fb6344e1de550':
  Annotate root objects and show their types.