Merge "Add support for new root.expand() calls."