Merge branch 'js/remote'