Merge "Bug 499: Initial implementation of supporting tree structures"