changes for js
Merge branch 'case-1996' into develop