Merge branch 'js/t4130-rename-without-ino'