merge from ny dev code