merge changes from NY dev