Merge pull request #6945 from dannil/ntpc-to-js