Merge "List top root node fix"