update for ruleJS
Merge branch 'feature/ruleJS-issue' into develop