Merge branch 'js/remote-improvements'