Merge branch 'NodeListing' into MASTER_GUI