JS updates to support HR-337
Merge pull request #2878 from colemanw/js

JS updates to support HR-337