Merge branch 'ny' into develop