Merge NodeJS changes from idottv repo