Merge branch 'js/remote-archive-dwimfix'