Misc. JS module updates
Merge branch 'Development'