Rebase next_gen_node on master