Adding all changes before closing branch
Merge branch 'js_transfer'