Merge "Fix NPE in DataTreeCandidates"