merging dev to dev-js