Rebasing next_gen_node with master - Attempt 2