Merge "Fix potential NPE when dumping child nodes" into main