Merge "Bug 499: Initial implementation of data tree modifications"