Merge LinkNY changes