Pull define-node-cleanup into release branch