[Do Not Merge] Testing next_gen_node rebase PR against master