Allow for dollar symbol in js function name
Merge branch 'np1-develop' into develop