Some more transformation code for JS
Merge branch 'development' into staging