Propagaating fixes of node down issues from 6.0 to master